House cleaning, some refactor, nothing new =)