Forgot () on a function
Some refactoring