Accidentally left in redundant code, minor optimization