Cleaned up variables and comments