CLEAN CODE AND FIX UI ERROR ANSWERS