Comment handling
Code formatting