Source code was optimized (cosmetic fixes)