DOC: added comments and cleaned up