Cleanup for ease of understanding