Commited #470 by adding cleanup and codeformat.