NERD002, refactored modal into it's own directive
NERD002, fixed formating and removed unused code