Cleaned more up