Some quick refactoring