Renamed file and fixed formatting
Undid file rename
Merge branch 'formatting' into lightning