add idea stuff
fix regexp usage, minor refactoring
fix regexp usage, minor refactoring
fix regexp usage, minor refactoring