Code styles and fixes