Cleanup tabs, add -C as alias for --cpus

Thanks Adam for the review, here're the changes.