Some refactoring

Some quick refactoring