Further refactorings, ahoy!