Cleaned up more ugly code!