Marius Miliunas - Made the code cleaner (in my opinion) and better adding certain default parameters that were missing