Cleanup tabs, spaces and references