general readability improvements / code cleanup