Added a few code cleanup's