apphance plugin
minor refactor