Cleaned up code and update sortable settings