Fixed where
completed some formatting