Init: Cleaning

Commits @1f09b96b102d67314338acf645ddf2f50a523dbe & @5c329ca1d3e740b71afe2afea499a3bb28b3af84