Cleaned the dir, Re-used more code