Implemented attack order and cleaned up stuffs