code cleaning

mostly positioning comments