Stylish changes
Stylish and naming convention changes