Clean up

Did some renaming e.g. offset-x -> offset-angle
Cleaned up the macro that generates assembly defmethods.