140401 Refactor