Tweaked Upload feature and code cleanup