Arm Logic cleanup

arm logic was silly and is now cleaner (single return - no if)
still need to .gitignore makefile...