Refactor: forgot to actually use new methods :)