Code cleanup, nitpicking at formatting