revert meaningless changes
small tweaks
remove unused variable