Better styling. Removed unnecessary includes.