Cleaner code

Even more bugsquash