Minor changes, no functionality changed