Further code clean-ups for readability