Some error and clean

Fixed issue #3
Some spaces removed.