Addressed formatting issues and updated build configuration