Cleaned up directory more