got rid of unnecessary enters