code cleanup, added angular and underscore -_-