Minor Fixes, Style Changes