Add some style, expand comments