refactor(ripple): cleans up attribute names and re-arranges code