Cleaned up suntax and variable names