Tweak setup method
Comments are good!