Cleanup and Features

Added Currency name Feature, cleaned up and re-factored code.