Changes and cleanup to prepare for use