Code Cleanup/Lower dragon