Fix some inconsistency; more formatting