CodeStyle Fixes