Release 1.4.1

Code refactoring