updating some minor fix & formatting