Code Cleanup

Code cleanup. Added see more link for lazy loading.