Cleanup code, connect all _apply methods, add convenience.