More clean-up

Members are now in a more readable order, members that are not used have been removed, and everything is better partitioned.

Author: jeffstall