update and cleanup added comments