cleaned up a bit
.