Reworked to enhance code discovery
    * Signed-off-by: Bob Newgard <bobn.code@gmail.com>