Cleaned up and changed a few things on arm