Code Style and Layout Fixes