More cleaning

Still rubish and noobish...:\