Better Node API, cleaner code