Basic weapons, refactoring, indentation