removing unused class
fixing check style issues
renaming variables according to check style rules