cleaned up for my editor