Formatted source
Removed need for system clock
notifications