Removed Windows compatibility string \r
changed some var names