fixed some formatting issues
continued improving formatting