Revert code styles commit
Changes per review