Formatting and adding better comments