Consistency and minor cleanup