cleaner refactor on methods