#15 clean up declarations
#15 clean up declarations