Mostly code clean up

-Critical hits