Style fixes

Replacing << with normal method names in a few places
Remove duplicate code
Prepare 2 more code places for @StaticCompile