Simplify init code
Except I mean 900, and we should use it everywhere