small improvements for better code readability