Whitespace fix and Stager API change