Code cleanup: Fixing tabs, indentation