Modified comments and statements to comply with the coding style guide