Commenting

Added overrides annotations and reordered methods in order of
importance.