Cleaned up spaces and tabs