updates ier usage and prettifies code
adds line breaks to avoid warnings about too long lines
updates use statements