changed code structure and cleaned