Code cleanup

Code cleanup as requested ;)

Please try if it still compiles! :P