Change for the sake of change

More Changes!!! just cleaning up and optimising (over engineering) the
memory management functions