Sunrise/sunset bug fixes and code formatting changed