Cleaned up to meet size requirements again.