Code Alignment and final touches.