Update to even more opinionated skeleton