Style Updates and Fixes