removed unused static import
minor code improvements