Code cleaning: removed commented code and (slightly) code documentation