Simple cleanups done while browsing the code to get familiar with it

Hi,
I wanted to get a bit familiar with the code structure and while browsing I took the liberty of making some small cleanups to reduce the overall indent of some scripts and remove some noop code.
Hope you accept those small fixes, cheers!