Clean code, add support for years