Minor Fixes

Removed unnecesary return
Fixed indentation