Added new currencies + code cleanup