Remove some duplicated code lines - Thx Scrutinizer