Cleaned up naming convention and SuperBlock fields