Code qol and preperatin for next commit