removed superfluous returns