Fixing up style concerns