Warning and style cleanup