Improved code formatting and added name feature

I hope this one meets your needs.