Added some more annotations and formatting fixes