Random cleanup and formatting