Style and Complexity fixes