updated copyright year and cleanup