clean code and updated framework.usage()