Clean code before devise