Clean up naming conventions, add removeAll