context fixed, cleaned up