Fixing style and workflow