Clean up code
Correcting order of includes. Remove unnecessary new lines. Removing old function declaration. Typos.