removing code smells
better browserstack organizing