[1] refactor code names and removed un-necessary var