API cleanup (#18)