Code reformatted; init issues are fixed