Cleaning up some serious stuff :)
.