Added missing { }, removed unused imports and removed automatic generated header