Some more code cleanup :+1: