Code Style Updates & Corrections