Clean up syntax and extend from revisionable