Renamed suspicious constant field names
Deleted commented code
Fixed incorrectly ordered static modifier
Fixed trailing comment
Fixed exposing internal, mutable representation