Completed the reinforcement phase, and refactored a little the code.