Cleanup and added search thing