Updated: Clean up dirty code