Final commit, cleaning up