App re-written in Object Literal Pattern, and working well