General code cleanup

CLLLLLLLEEEEAAANNNNN UPPPP