Clean code
Re-factory