Combine elements into one import and remove redundant code