Code style and visibility improvements