cleanup (make it easier for my brain to parse)