clean code, refactor code, fix possible PNE