Cleaned up variables and names.