Code more clean