Cleanup

Again, changes done while going through the code.