Cleaned up fighter / move interface