polish up code as a sample project