simplification of application and addition of comments