Code more clean...