Some reorganizing

-Getter functions now take no arguments