Refactoring some stuff

fail