Some code neatening