[engine]More code cleanup + Doxygen happiness