Use macros and esi for context.
Fix coding style.