post story code cleanup
wrap up post story code cleanup