final changes

final changes in the code for better readability