AN - 9

Code cleaned up