Code cleanup
- Idea's warnings fixed
- message moved to .properties file