Cleaned more code.