Some code readability added