Cleaned it a bit up