Updated usage and comments detection