Some code cleanup to match personal naming ruiles