Improvements in source code #336