cleaning up the toggle a bit more