Small Changes -- Code cleanup