Refactor code to user system from last commit correctly