Clean code -- Fix #12 Fix #2