Format & Cleanup fixes

Disabled unused code removal in Cleanup (reverted private constructors)
Formatting now allows single line statements without brackets and inlines return expressions.
Conditionals are now set to always split into newlines (greatly improves readability).