Some evening refactor 3