code cleanup
kaminari pagination added