Cleaning up this shit!