codesenberg and joeshaw fix style-related and other issues