Cleaned up style