Cleaned up variable names, removed some testing code