* Use executable dir for the dev check * Handle executable in bin and platform dirs * Remove commented code * Rename variable