engine: line-up function parameters
engine: remove unused error type
engine: minor code style fixes