Removed extraneous code, adjusted notes