[cleanup] Cleaned up the code, removed all the unnecessary commented code