Change format and removed comments