changed var name
changed action names
changed action names
removed unused code
removed unused code
added