Added basic refactoring of attacks
Fixed findbugs issues