Fixing some critical issues with coding style.