updated styles and tweaked naming convention