Cleaned up the code a bit.
Reference to user added and improved retrieval.