Added comments, better line breaks