Better naming of sentinel members and some formatting