Started combat system, cleaned code