Cleaned up declarations