cleaned up code
.