Cleanup

Some quick cleanup. (wip)