fixed indentation and removed comments where needed