refactoring/cleanup + get started with runtime