Fixed issues with tabs making code look ugly