Fixed jshint errors and merged complementary