Minor refactoring and reinforcement calculation done