added comments, changed style, increased cache time