indentation and removed comments