Made comments, removed extra code