Added startedCallback and some syntax cleanup