Cleaned up Style