Refactor-fucking-acting... again