Modded a bit

Can't remember really what went on in my head to actually refactor all
of it