Source: Cleanup and simplify some code
29 files changed