reduce inecessary code