Some code cleanup has been applied