Cleaned code
1.4.0