Removed unnecessary returns from some files