E1 - added comments and cleaned up the code