Added bool; clean up