Adding some assertations for passed variables
fixing a lot of very bad whitespacing