Dealt with many style issues