Fix missing file bug. Clean code.