Removed extra annotations, fixe a bug where it was not going through sub routines correctly.