clean up declarations, spacing