More comments, moved some methods