simplified & cleaned up