code quality/style fixes