Small changes to code format and comments