minor cleanup with indtation and removing comments