cleaned up for old and stray comments
corrected indentation for javascript