get rid of redundant comments and messages
fix formatting issues
fix inheritance issue