removed shit and finished newlines