More verbose output and eliminate hardcoded values