Cleaned up servo API