Refactor of last commit