Cleaned up styles and naming conventions.