Removed a bit of redundant/unnecessary code