Added a few things to add qualiy to code