clean code, updated resources