updated styles. cleaned up code