Private final fields removed and more code polished.