Removed comments and changed return variable name