code clean up - new helpers created & TODO section needs to be fixed soon