Cleaning a bit up