Cleaned up additional Code