Did a little cleanup, still some work is needed though.