Make feature detect return the features object
Code review tweaks