Cleaned up the code a little and deleted test function.