Improved code flow very slightly.