finish prototyping of the disparos and clean code