More package changes + indentation