Commited #470 after modification bug, CD format.
Commited #470 by adding cleanup and codeformat.