Code Style fixes (Thanks @b2z)