Rearrange code, nothing new but who cares..