Cleaning

Moved data calls into seperate function to remove code duplication.
Started cutting down on calls.