Continue code improvements