Update copyright notice
Small tweaks
Better variable names