Just aesthetic changes, minor fixes