Remove dead left-over code
White space cleanup

Also armonizes indentation