fix/cleanup
added comments
cleanup