cleaned up kaminari etc