Fixed final formatting issues