Updated comments and remove ngEnter