Some general cleanup and readability enhancements