Cleaned up code for looking at