Add comments and move private property/methods after public properties/methods