minor code improvements
using dot notation for properties access