some changes to improove usability and readability