fixed the tab and spaces inconsistency and removed extra debug comments