Code cleanup
Peer dependency grunt 4.2