remove unused variable
remove unnecessar variable manipulation
refactoring