cleaned up followings code