Little refactor on each method