Cleaned up per Kuba.