Implementing changes suggested by @jbrechtel
removing .idea