Removed unnecessary notunit functionality and made style changes