0.1a  Rearranging a few Methods

-rearranged a few methods for more logical handling of data