HTML tags added + some minor optimizations