added comments and cleaned up structure