More code formatting issues corrected