fixed small logic issue and spacing