init code cleaned up