Code more conndense and modular