Another cleanup :)