More comments

- More code organizer