updated var statements and added improved readability
updated var statements, this/self shenanigans and improved readability
syntax cleanup
more syntax cleanup
updated var statements and improved readability for tests