Code improvements + optimized the excerpt output