More cleanup and organization