cleaned imports
add class to reserved keywords
fixes #3