CAPX-37 | Clean up from developer comments.