Cleaned up and commented observer