Adding more polish to the code itself