Modify comment so that they are inline with the application