Removed console.logs and redundant return property test