improved annotation settings
removed unnecessary annotations