Refactor slightly, still messy