cleanup and added schema