Yeah, this is cleaner