Cleaning up
Fix select issue