fix / clean code