Change init signature and clean up code