Cleaned more code