clean code xD
fix merge - cc