cleaned js, more private vars