Remove bootstrap notify, cleanup some indents