Handle notification levels and some refactors