minor refactor & allow compiling on start