Added armor and cleaned up the code a little bit