Reverted changes, modified formatting