Got rid of unused includes.
Identation.