Included lint and fixed some errors