Consistentcy in interaction blocks and remove unnecessary code

Just making some things consistent across files. Also removing some unnecessary code.