Fixed hw
Solutions done
simplify