Minor clean ups to make code look shorter and neater (sort of)