reorganizing layout and updating comment format