Improved comments and lazy loading logic