163e: Clean up code