Finishing refactor?