Some more cleaning

Just straigtening things up a little