Improve code readability and fix copyright date