Minor code refactor. No functionality added ore removed