style changes, test, remove extra emit from timer