* [AH-987]: Updated lint issues * [AH-987]: Formatting fixes * [AH-987]: Base changes * [AH-987]: Base changes