some minor changes

involving code indentation, naming coherency and copyright year