cleaned some Tower's code, easier to read.