General cleaning of the code and solution’s configuration