refactory BeetlKit.java