fixed some includes
fix whitespace and coding style