fixed spaces and formatting issues