Finally fixed .op and .deop and cleanup

We should use the formatting like essentials