Re-organizing some details
Do a little code cleanup