Minor improvements

Removal of some redudant code, aesthetics