Re-factor getting started sections