Cleaned up style and naming.