Clean up spacing and remove unneeded return statemants