Lil bit of API cleanup