Cleaned up code, changed variables.