Some minor improvements

Some unnecessary code should be put off.