formated and removed comments