refactor last coomit