Cleaned code with better formatting for Quickstart