Code re-arrange
Little bug fix

Just A Little