Made System definition prettier.