Clean up 3

All code cleaned.