clean code, fix library