Fixed naming and formatting issues.