LCD Code Cleanup