Cleaned more stuff up