Green code

Make the code greener.