Code Cleanup

Removed _ in favor of - in class names