Removed extraneous declarations
Updated annotations