Cleanup code
Add Jetpack Infinite scroll support