Try to keep formatting changes separate, to keep commits more readable please.