Documenting comments & cleaning up formatting