Cleaned up formatting and naming.