Code more cleaner