Addressed more pull request comments

Made some variables final and renamed few methods in AnimatedAdapter