Started cleaning up stuff