Small Code Cleanup