refactor: improve formatting and readability in billing and users com… #1805

Job	Run time
build-and-push-cloud-image	6m 2s
build-and-push-schedule-image	2m 49s
build-and-push-server-image	2m 58s
	11m 49s

Provide feedback