refactoring
working on Java version of the Lemon SDK