refactor according to Btrplace 0.30-SNAPSHOT 20130603-211209-21.jar