Add file for testing
Make code more idiomatic