Cleaning up necessary whitespace trimmings and updates