Cleaned code

Fixed spaces, unnecessary includes removed.