cleaned up (at least a bit)