made some changes, shorter lines