just some formatting changes
removed conditionals