code clean up, started on #14

#14 would be solved if the full_contains could track the sort (which is
commented out right now)