clean code and added support for geppetto