[+] Minor changes
[+] Added minor chenges
Minor changes to convert code into more Scala-style