Years, authorization, helper file and reorganized code