Code Clean Up & Rearrange