Refactor code + naming