Almost final code polish