Add blank init back in
Merge branch 'cleanup'