Removed unneeded returns and changed spacing to 2.