Refactoring, Version 0.1.6