infinite scrolling
clean
naming conventions
refactor

according to naming-conventions