usings cleaned up
extracted notification properties to new class