Redefined notifications + tidied code and docs