Code Imporovements