Fixed import
minor (indentation)
minor (remove extraneous functions)