Cleaned up tabs + spacing