mainly beautifying code.. adding todos