Cleaner classpath code