Remove useless code
Consolidated methods

Method renaming, and put some actions in a single method to keep things
synced.
Better name for a class

This was constantly confusing to me.
Property renaming
Revert "Property renaming"

This reverts commit 6afb7943e3b01849085af730e1dfcd9df4310647.
Property renaming again
Documentation
Property renaming yet again
Annotation marks on the proper side

This has apparently always been exactly opposite how it should be, and I
only just noticed it now.