code style and headers fixes