Remove unecessary code, fix tabbing