Code style — #3, #7