Another cleanup =)