Cleanup and adding split