Standard

Fix #118.
As discussed, revert the changes in this file.