added decimal functionality
Minor cleaning