Fixed some indention, added comments