Cleanup & adding of year option.