diff --git a/app/src/main/java/com/tylersuehr/chipexample/MainAbility.java b/app/src/main/java/com/tylersuehr/chipexample/MainAbility.java
index 2a7cdfed6797c2c5e74d8ae11506a4a857445c0a..f4fb6c5567fe6c68a00cb6ffd2a7a2c4049f721b 100644
--- a/app/src/main/java/com/tylersuehr/chipexample/MainAbility.java
+++ b/app/src/main/java/com/tylersuehr/chipexample/MainAbility.java
@@ -1,3 +1,17 @@
+/*
+ * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.tylersuehr.chipexample;
 
 import com.tylersuehr.chipexample.slice.MainAbilitySlice;
diff --git a/app/src/main/java/com/tylersuehr/chipexample/MyApplication.java b/app/src/main/java/com/tylersuehr/chipexample/MyApplication.java
index 4a40d77716ace15517e3ba9af9d44320b2476e99..6603e5d876cc6a8582cef7f67f5a66fb39432084 100644
--- a/app/src/main/java/com/tylersuehr/chipexample/MyApplication.java
+++ b/app/src/main/java/com/tylersuehr/chipexample/MyApplication.java
@@ -1,3 +1,17 @@
+/*
+ * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.tylersuehr.chipexample;
 
 import ohos.aafwk.ability.AbilityPackage;
diff --git a/app/src/main/java/com/tylersuehr/chipexample/slice/MainAbilitySlice.java b/app/src/main/java/com/tylersuehr/chipexample/slice/MainAbilitySlice.java
index b833df1d2e90301065a3322349ef286786f3cf84..21aea1c4c320f46b3f79f647ad203c25b937059d 100644
--- a/app/src/main/java/com/tylersuehr/chipexample/slice/MainAbilitySlice.java
+++ b/app/src/main/java/com/tylersuehr/chipexample/slice/MainAbilitySlice.java
@@ -1,24 +1,21 @@
-/**
+/*
  * Copyright (C) 2021 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.tylersuehr.chipexample.slice;
 
 import com.tylersuehr.chipexample.ResourceTable;
 import com.tylersuehr.chipexample.utils.KeyboardVisibilityEvent;
-import com.tylersuehr.chipexample.utils.KeyboardVisibilityEventListener;
-import com.tylersuehr.chipexample.utils.Unregistrar;
 import com.tylersuehr.chips.ChipDetailsView;
 import com.tylersuehr.chips.FlowLayout;
 import ohos.aafwk.ability.AbilitySlice;
@@ -33,8 +30,6 @@ import ohos.agp.window.service.WindowManager;
 import ohos.app.Context;
 import ohos.multimodalinput.event.KeyEvent;
 
-import java.security.SecureRandom;
-
 /**
  * MainAbilitySlice
  *
diff --git a/app/src/main/java/com/tylersuehr/chipexample/utils/KeyboardVisibilityEvent.java b/app/src/main/java/com/tylersuehr/chipexample/utils/KeyboardVisibilityEvent.java
index 2dc7b29653e5c18fb8280fb415c3a4a626bdfa22..605238b18c610abbb9b8df9ae8361add9dd2b684 100644
--- a/app/src/main/java/com/tylersuehr/chipexample/utils/KeyboardVisibilityEvent.java
+++ b/app/src/main/java/com/tylersuehr/chipexample/utils/KeyboardVisibilityEvent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2021 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.tylersuehr.chipexample.utils;
 
 import ohos.agp.components.Component;
diff --git a/app/src/main/java/com/tylersuehr/chipexample/utils/KeyboardVisibilityEventListener.java b/app/src/main/java/com/tylersuehr/chipexample/utils/KeyboardVisibilityEventListener.java
index 4b3c9fa3da6b7c20c61e9ea294ec932c49e7f4ff..49aa8fe4104071bf4a08943f8024651cafd2a1e6 100644
--- a/app/src/main/java/com/tylersuehr/chipexample/utils/KeyboardVisibilityEventListener.java
+++ b/app/src/main/java/com/tylersuehr/chipexample/utils/KeyboardVisibilityEventListener.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2021 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.tylersuehr.chipexample.utils;
 
 /**
diff --git a/app/src/main/java/com/tylersuehr/chipexample/utils/SimpleUnregistrar.java b/app/src/main/java/com/tylersuehr/chipexample/utils/SimpleUnregistrar.java
index 6a81e6b5dee3e227e5f306ba7076095f1bfc1392..927c6c671bf01d824d6bc1e2290fc4b8c196f5e1 100644
--- a/app/src/main/java/com/tylersuehr/chipexample/utils/SimpleUnregistrar.java
+++ b/app/src/main/java/com/tylersuehr/chipexample/utils/SimpleUnregistrar.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2021 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.tylersuehr.chipexample.utils;
 
 import ohos.aafwk.ability.AbilitySlice;
diff --git a/app/src/main/java/com/tylersuehr/chipexample/utils/Unregistrar.java b/app/src/main/java/com/tylersuehr/chipexample/utils/Unregistrar.java
index 417beb8fea40b7b2cdc9b716676e3f550316a277..0a1c5468356883a4899db2b118e53431d6fe6d16 100644
--- a/app/src/main/java/com/tylersuehr/chipexample/utils/Unregistrar.java
+++ b/app/src/main/java/com/tylersuehr/chipexample/utils/Unregistrar.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2021 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.tylersuehr.chipexample.utils;
 
 import ohos.agp.components.Component;