small code cleaning

HybridCMS code optimization and fixed headers error