Annotations implemented
Global code rearrangement