Removed useless includes
Inlining suggestions
Removed useless explicit namespace
Name refactoring in input module