Minor Code Cleaning