Some refactoring has been made