keijiro Refactoring and cleaning up.