Style fixes for engine package