Minor Code Rearranging