Minor code modifications