It's ramadan, time for a commit. Just some code restructuring here.