Cleaned up the style