Big fix & style modification