Cleaned more up (spaces)