cleaned up style throughout