Just code cleaning