Code cleanup - identation, spaces, tabs etc.