Some clean up, some comments, sample maze