removed extra crufts :)
minor tweaks