Added year command line argument + smaller edits for coding style