API cleanup & edits