Cleaned up code, rm space/tab conflict