Fixing Style Issues