Some code cleanup has been made