Fixing style bugs