removed some unused includes
Refined style