Stylish changes
constness improved