cleared a few commented lines and identation